Cherry‐pick 256f310670f201eeaff20ff10d8a4c444d573530