(cherry picked from commit 6cb43cac824d57e0ebafc3b00bb15104ff78d4be)
(cherry picked from commit f01b6325ed1784f1bebc3fc755da01e6fda60070)