(cherry picked from commit 61ec0fcd)
(cherry picked from commit f42e229b)
(cherry picked from commit 3161dece)
(cherry picked from commit a35211fd)