(cherry picked from commit 2a237de983afe9f75060e5f36b1b826428e71a1c)
(cherry picked from commit 357cbbb226c32d7604e7a4ea7af3aacb3c941512)