Merge branch 'mt-cmake-fix' into 'develop'

Change of branch in external project

See merge request !21