(cherry picked from commit c1dc9431)
(cherry picked from commit 1ccd6158)
(cherry picked from commit 01ef1930)
(cherry picked from commit 78e26579)
(cherry picked from commit f12e4e4b)