(cherry picked from commit 0b9cf35b17e17eb2aa283bd1f8ebfd059497e96d)
(cherry picked from commit 4440ec866c6ef5f9f68f9b6c4248ab3d2c6f3bb9)