Merge branch 'backport-revert-vs-show-cmake-files'