(cherry picked from commit 5c58bc4e0cb939e46abdedeffa3b7c0cfe6206bf)
(cherry picked from commit b5fb700e4e2488d1117748ccadec6ba00426c279)