1.2.10.2. Cherry picked from a796d96f0a845ab537a61199bd4fe9365d7f3793