(cherry picked from commit 7e063c59b6674513a05aa6c5b5c1fae6b2a06435)
(cherry picked from commit 08d6d2bec710b68a4180ec510fe625e2c9c4bf99)
(cherry picked from commit 88a9e2bf368f647f0fe334b6d5d11abb3871e327)
(cherry picked from commit 73e11d773187914bb2aeeea3de7a06d52272aa86)
(cherry picked from commit 3a879d4fb252a66309f3eb1b9d7eefcc67b0f3de)
(cherry picked from commit b95c8391af30bc5d30c7d351d9756c98a0a29ca7)
(cherry picked from commit 984fa368ba59be2468757e9424889ca8162a99e5)
(cherry picked from commit 47a14ca0321a7e1a8364e7f370c28cb1da22b4b9)
(cherry picked from commit 6a2e56a0ac4e8dbddf2af337798083f78c264f5d)
(cherry picked from commit f7830abf1d9976ab0ebd7380874346de4988219f)
(cherry picked from commit 99d9b3a941e615a1f4b4b8823b27fcbc7ee63cb5)