preparation for more small ships
Merge commit 'ba5a4ef067f7fed644508dd23deb954d4efbca32'