Stage 1 Merge Fixes
Stage 2 Code migration for Mariner. Do not use - Necessary to rebuild Vox outpost for Vox employees.
Run-ready commit of map, deletion of backup map to cease tracking