(cherry picked from commit 067f0982)
(cherry picked from commit 91de2057)
(cherry picked from commit 1df84c3e)
(cherry picked from commit b6a326b6)
(cherry picked from commit 09959a95)
(cherry picked from commit 77f3cfa8)
(cherry picked from commit 517c2cc9)
(cherry picked from commit b08d26db)