Built cross-platform-shapes from commit 02589ad on branch master