(cherry picked from commit 9f3d5d13d4fedcca53ebb779a2cfca1e286c79da)
(cherry picked from commit 44d6c4fe440b6a44de3fa90a99b01652660188f3)