(cherry picked from commit 631de412)
(cherry picked from commit d879cd91)
(cherry picked from commit 40ac776a)
(cherry picked from commit 02910b50)