Merge branch 'backport/3.4.9/snapshot-1' into backport/3.4.12/snapshot-3