Stop Naval Factories from sinking
Merge remote-tracking branch 'origin/Fix-Sinking' into Develop-+-Manual-Merge