fix misplaced merge onto devel branch, #32250