(cherry picked from commit cb4c78b1ac26f41732fb9764475ef63ead44cd60)
(cherry picked from commit 4fd9dfd1f842f145485eeefa8581b771caf68a5f)