cherry pick 4899614