(cherry picked from commit 561f47a7ea6b4e8c5a69d069dbb15641ce41d110)
(cherry picked from commit d9e7dd70a35d800bee94fd32b7193f8dfa32c40c)