shipyard support
Merge branch 'shipyard-integration'