Merge branch 'fix-automoc-warnings' into release-3.11

Merge-request: !2066