Merge branch 'autogen-write-on-change-only' into release-3.11

Merge-request: !1753