Code merge from latest ship-simu code