(cherry picked from commit 378bc316)
(cherry picked from commit 96f5e7fa)
(cherry picked from commit 50f557f4)
(cherry picked from commit 1fea1163)
(cherry picked from commit 28f3f539)
(cherry picked from commit 12a5ac98)
(cherry picked from commit dc2bd361)
(cherry picked from commit 54cb00d7)
(cherry picked from commit f597fff3)
(cherry picked from commit 481dc9ef)
(cherry picked from commit 30d0c176)
(cherry picked from commit c91304c9)