(cherry picked from commit 9bf452856cb40c7d1475eb2c7471c17d7861bac3)
(cherry picked from commit 3bf14623ad56d3979fe335a6485ab834258a6057)