(cherry picked from commit c6162e80)

(cherry picked from commit ba751ce6)

(cherry picked from commit fcd66b0a)

(cherry picked from commit 58f9d5f0)

(cherry picked from commit 57f2abfe)

(cherry picked from commit 97d1d9ff)

(cherry picked from commit b24ce801)

(cherry picked from commit 817395e6)

(cherry picked from commit 82fc811c)

(cherry picked from commit b9d84879)

(cherry picked from commit 2bd7d5ab)

(cherry picked from commit e78e90eb)

(cherry picked from commit 0cea681a)