(cherry picked from commit 89e379a7)
(cherry picked from commit a311bae1)
(cherry picked from commit 79de63e3)
(cherry picked from commit 5a971a0e)
(cherry picked from commit e1ed920b)
(cherry picked from commit 7345e6af)
(cherry picked from commit 8ef0c5aa)
(cherry picked from commit e09dbcef)
(cherry picked from commit 4231d95c)
(cherry picked from commit f329c8f6)
(cherry picked from commit e1710fdc)
(cherry picked from commit d4f7fa46)
(cherry picked from commit 0ebc1a32)
(cherry picked from commit 0d650bdf)
(cherry picked from commit c9b56751)
(cherry picked from commit 22030e84)
(cherry picked from commit 1c1e0e11)
(cherry picked from commit 71810a43)
(cherry picked from commit 072092dd)
(cherry picked from commit 36025b34)
(cherry picked from commit b745639c)
(cherry picked from commit 6096bb83)
