(cherry picked from commit 43f3c6743483544343eb814dfe98419e19cfc52e)
(cherry picked from commit 1aae769562d42b459362f43a156eb6891863c726)