Merge tag 'backport/v4.9.13/gen3-to-v4.10' into backport/v4.9.15/snapshot