Fix #8697
Merge branch 'master' of github.com:qgis/QGIS