(cherry picked from commit b07123ee7b441946bdeacf38dfbabde705427f63)
(cherry picked from commit ca85c880b476428b407c30b4b1776b2e008c9330)
(cherry picked from commit 196a72c7eabb1000a7a9c7dc42818105ec3357f7)
(cherry picked from commit 5f84d3cbd4)
(cherry picked from commit 3e4cdd4b3a63d39164e2299abcb8bb847e311557)
