(cherry picked from commit 835ad1b7)
(cherry picked from commit 49e364be)
(cherry picked from commit 0dca6edd)
(cherry picked from commit 63e1ff58)