Fix External Raet REfactoring bugs
Merge remote-tracking branch 'upstream/develop' into sam_raet_36
Merge pull request #11992 from SmithSamuelM/sam_raet_36

Fix many external Raet refactor bugs