(cherry picked from commit f44b7e0c)
(cherry picked from commit 12febf02)
(cherry picked from commit 88b047c1)
(cherry picked from commit ef63bc68)
(cherry picked from commit d0c8782e)
(cherry picked from commit d7441537)