(cherry picked from commit 57ab36d3)
(cherry picked from commit 76c66b2e)
(cherry picked from commit 6e5f2354)