Cherry-pick from branch 2

Cherry-pick from branch 2