(cherry picked from commit f3c35f3f)
(cherry picked from commit 1126922b)
(cherry picked from commit c9e1423f)
(cherry picked from commit 53e4be27)
(cherry picked from commit 2e707046)
(cherry picked from commit cdedd9a5)
(cherry picked from commit 1a76aa95)