Fixed faulty merge between developer and shipmovementtest branches