Working on a way to whitelist fields set during stage load Bunch of possible divergence fixes Merge branch 'master' of SpaceUsurperUnity Even more divergence avoidance