(cherry picked from commit 571bc8c9)
(cherry picked from commit 75e4f8ee)
(cherry picked from commit 9a557bdf)