(cherry picked from commit f00d4309)
(cherry picked from commit d5969056)
(cherry picked from commit 8e78fd70)
(cherry picked from commit 85e62204)
(cherry picked from commit a7fbf99b)
(cherry picked from commit 6b19b436)
(cherry picked from commit 9bc6342f)
(cherry picked from commit d28b79a9)
(cherry picked from commit 7e4c3cf7)
(cherry picked from commit af8e12f5)
(cherry picked from commit e21aa229)
(cherry picked from commit 8b6d43f5)
(cherry picked from commit 68739fbb)