Cherry‐pick 4b3c212