(cherry picked from commit c6b543e0729bc20f15e37d074fbf31d8c76c187a)
(cherry picked from commit 5e57ffbcf9ac3a346d4bf2b692248393215bad89)