(cherry picked from commit 5120905f)
(cherry picked from commit 3b54d298)
(cherry picked from commit 73f61f06)