(cherry picked from commit d6c03f12)
(cherry picked from commit 70e1c889)
(cherry picked from commit cfb4c9f1)
(cherry picked from commit 4a1614bd)
(cherry picked from commit fd47bb52)
(cherry picked from commit 67d418a9)
(cherry picked from commit fbc5401d)
