Core cherry-pick e83339103f08db8e48a2ba8186324d575f069e83
Merge master/chiba