Merge branch 'cmake' into 'develop'