Merge branch 'cherry-pick-3ae448b5' into 'maint/1.1'