(cherry picked from commit 200bd3ee)
(cherry picked from commit 1464b111)
(cherry picked from commit 8ba7da8f)