(cherry picked from commit 7077a7c7)
(cherry picked from commit cd3a1b3e)
(cherry picked from commit 5faaa75a)
(cherry picked from commit ef34f1a2)
(cherry picked from commit 9f6112a5)
(cherry picked from commit 95cb2f9d)
(cherry picked from commit 8d10efac)