Code merge from latest Ship-Simu code