(cherry picked from commit 0b02fb9219f07e212d7a0f67dacd7747b622ee45)
(cherry picked from commit 9039728d89f07852904962685581c752ffebcdc6)