Merge branch 'fix-the-build' into 'develop'