Merge branch 'cherry-pick-for-2.15.0'

Ensures that commit won't disappear from git in the future.