(cherry picked from commit 731a9566)
(cherry picked from commit d25e1259)
(cherry picked from commit 5e97c86d)
(cherry picked from commit 8ff7c87f)
(cherry picked from commit 65882381)
(cherry picked from commit 8c9be5ca)
(cherry picked from commit 4958ea7b)
(cherry picked from commit 98485c39)
(cherry picked from commit 5a10f56a)
(cherry picked from commit 5d80d462)
(cherry picked from commit fd3ac67c)
(cherry picked from commit 9ce4fc1d)
(cherry picked from commit af4ce2d0)
(cherry picked from commit ed8c5a4f)
(cherry picked from commit 9f12e7f7)
(cherry picked from commit 8be72857)
(cherry picked from commit 07799412)
(cherry picked from commit c09b9299)