(cherry picked from commit 2fbb5d5b)

(cherry picked from commit 05fda811)

(cherry picked from commit 39e2a4e9)

(cherry picked from commit 8e27beb5)

(cherry picked from commit 28f9a4cf)

(cherry picked from commit 7cf88132)

(cherry picked from commit c6162e80)

(cherry picked from commit fcd66b0a)

(cherry picked from commit 58f9d5f0)

(cherry picked from commit 57f2abfe)

(cherry picked from commit b9d84879)

(cherry picked from commit 2bd7d5ab)

(cherry picked from commit e78e90eb)