fixes from staging
clean up staging hotfixes
Merge branch 'relocator_fixes' into develop