Merge branch 'backport' into 3.4