Merge branch 'feature-cmake' into devel