Ship: methods allowing upgrades
Merge branch 'TEMO' into M9