(cherry picked from commit c1628bbf)
(cherry picked from commit 3a25b4b7)
(cherry picked from commit 4c253df1)