(cherry picked from commit ec156077)

(cherry picked from commit daa42d42)

(cherry picked from commit e7f647bf)
(cherry picked from commit 3b3ed902)
(cherry picked from commit ca6481d1)
(cherry picked from commit 501a1d6a)

(cherry picked from commit ba297070)

(cherry picked from commit 7f22f081)

(cherry picked from commit 8f3d9750)