(cherry picked from commit 9a817f245ad1f534985e86d19954d75a7ac82326)
(cherry picked from commit 309876b2487b5b7c011340f30b10fe5f88b48c76)