Merge branch 'cherry-pick-08ef8c91' into 'next_version'

mentioned in commit 4e0e577c

mentioned in commit b58c3992

mentioned in commit 2f788ee2

mentioned in commit 8a1d5450

mentioned in commit 06b33c88

mentioned in commit 81d25f33

mentioned in commit e27ad4cd

mentioned in commit 77e2b19f

mentioned in commit e27ad4cd

mentioned in commit 77e2b19f

mentioned in commit 9f5589a7

mentioned in commit 9f5589a7

mentioned in commit 7ed582e8

mentioned in commit 3885f268

mentioned in commit 7ed582e8

mentioned in commit 3885f268

mentioned in commit f13aa86b

mentioned in commit f13aa86b

mentioned in commit 1629e86c

mentioned in commit 7ea9ae58

mentioned in commit c73d204a

mentioned in commit 9980c4bf

mentioned in commit b5654d02

mentioned in commit b5654d02