(cherry picked from commit b0075a6f)
(cherry picked from commit 69f89b04)
(cherry picked from commit e6dccb60)
(cherry picked from commit 4462372b)
(cherry picked from commit 0c096315)
(cherry picked from commit c7ac2083)
(cherry picked from commit ee0e0eae)
(cherry picked from commit eacf920f)
(cherry picked from commit 6ca40bc4)