(cherry picked from commit 867381b8)
(cherry picked from commit f7634893)
(cherry picked from commit 067a9dde)