(cherry picked from commit b60391da)
(cherry picked from commit 9b0ed8f8)
(cherry picked from commit 289c349b)
(cherry picked from commit c378d413)
(cherry picked from commit 6aaba834)
(cherry picked from commit 22928ac8)
(cherry picked from commit 15214186)
(cherry picked from commit 57fb95f8)
(cherry picked from commit c5ab052b)
(cherry picked from commit f39ce32b)
(cherry picked from commit 143a9b34)
(cherry picked from commit 029393ad)