(cherry picked from commit c43fcea6)
(cherry picked from commit 7086992b)
(cherry picked from commit fffcede4)
(cherry picked from commit 726e4c05)
(cherry picked from commit 5f14ec36)
(cherry picked from commit 0e916fb2)
(cherry picked from commit 61192fce)
(cherry picked from commit 741bae45)
(cherry picked from commit d5654b79)
(cherry picked from commit b0250b97)
(cherry picked from commit eaabe7f4)
(cherry picked from commit 26fbbb0f)
(cherry picked from commit 409a032c)
(cherry picked from commit ae7f0008)