Merge from naval_scientist_fixes, fix wrong space coordinate for scientists zone and water checks (navmesh space instead of world space)