Merge branch 'backport/v3.10.28-ltsi-rc1/of' into backport/v3.10.31-ltsi/snapshot-merge