Merge branch 'doc-cmake-qt-fixes' into release