Dev to Brig branch to fix some incompatibilities to the map