Merge branch 'cherry-pick-8a7ee9fe' into 'stable'