Merges dev into Brig - Makes the new brig comply with atmos updates

This should ensure the new brig can be merged into the main BS12 repos.
I had two merge-conflicts which were related to the large scrubbers. May want to check for any in-map issues.