Fixup reactor in develop.

This includes a mash of #18762 and #19004