Today
merge from fix_deep_sea_portal_far -> naval_update