Merge branch 'cherry-pick-a65fc78c' into 'stable'