(cherry picked from commit bd6c048d)
(cherry picked from commit 438ad5b7)
(cherry picked from commit bd6d928a)
(cherry picked from commit 8ab6fb4c)
(cherry picked from commit 6d2a95ae)
(cherry picked from commit a5e7a055)
(cherry picked from commit d35678f1)
(cherry picked from commit 1c1d4e07)
(cherry picked from commit 505c27c6)
(cherry picked from commit 7ad477ca)