(cherry picked from commit 25f89aad)
(cherry picked from commit 2c8c4666)
(cherry picked from commit 3dca5386)