(cherry picked from commit bc2765ea)
(cherry picked from commit ac8eba7d)
(cherry picked from commit 87011deb)
(cherry picked from commit 5c6a2ef8)
(cherry picked from commit c782d9e8)
(cherry picked from commit 5497ae4e)
(cherry picked from commit 51aec445)
(cherry picked from commit 75e7e0e4)
(cherry picked from commit 2c25e3e3)
(cherry picked from commit dcd0e068)