Fixup reactor in develop.

This includes a mash of #18762 and #19004 
Effectively a sync of 2014.7 into this new file :)