Move remaining undef
use in OS extensions to prepend
#18378
Merged
undef
use in OS extensions to prepend
#18378