(cherry picked from commit 27b22f4e)
(cherry picked from commit 8dc0f2ea)
(cherry picked from commit 936126f1)