(cherry picked from commit b7b9cb3a0273530b1289c62fa3d5888e78d609c4)
(cherry picked from commit b700924ab7071a397d1bac67ad0453333c2c1b48)