(cherry picked from commit 819cf47d)
(cherry picked from commit 83ec1073)
(cherry picked from commit 5f1d2078)
(cherry picked from commit 9dd1dd8e)