(cherry picked from commit ed2ded1c)
(cherry picked from commit 15c1e714)
(cherry picked from commit 8d7757f2)
(cherry picked from commit c3687a0c)