(cherry picked from commit 109fb513)
(cherry picked from commit 91cfcac9)
(cherry picked from commit a35b1453)
(cherry picked from commit e02b08ba)
(cherry picked from commit ba0c2565)
(cherry picked from commit ac181f51)
(cherry picked from commit 937a0b9c)
(cherry picked from commit 08d84231)