Merge from naval_update