(cherry picked from commit 7c65a076)
(cherry picked from commit 88aab655)
(cherry picked from commit d4fe7fbc)