Fix accidental branch divergences

Fix some accidental divergences between the master and REL2.0 branch