(cherry picked from commit 9503d722)
(cherry picked from commit 69e28f84)
(cherry picked from commit 0cd0c895)
(cherry picked from commit 1334374b)
(cherry picked from commit d27cdb43)
(cherry picked from commit 2f5468ae)