Merge branch 'backport-3.9-autogen-moc-predefs-no-moc-options' into release-3.9

Merge-request: !1432