(cherry picked from commit 9b92075694334f2febc15b7a24d427f038ac0942)
(cherry picked from commit 7a4e8dcf5671bda8c4cb6e7c62a83db3f259389e)