Cherry pick 62ef556c1bab81b4f96f1f321271834e13061aee