cherry-picked 5bfd2976961ac0dfd7220ff994157a68fe44b2b4.