(cherry picked from commit e90ad20036e1ff612f19478f72d59fb4d495726f)
(cherry picked from commit bbb03d9e819232a170bdef0ed30b4e4771a4c6bf)