Merge branch 'backport-autogen-nexist-source-fix' into release-3.10

Merge-request: !1650