(cherry picked from commit 3bcaaa9b)
(cherry picked from commit 98b3b2b2)
(cherry picked from commit fe8706b6)
(cherry picked from commit c013ef01)
(cherry picked from commit a6dcd976)