(cherry picked from commit 89fdb5ced9a8fdcef1a066f7b14071541dda1eb0)
(cherry picked from commit 490bb901e175abe1d2b4c198a7c0a0424218c6df)