(cherry picked from commit d7834708)
(cherry picked from commit fbac6fb1)
(cherry picked from commit 8c31aa3c)
(cherry picked from commit bbb0d208)
(cherry picked from commit 88ddc985)
(cherry picked from commit fb93a51c)
(cherry picked from commit 8f4acc30)