(cherry picked from commit 70978db98c3af3fe72100fa6646780c7a5a13daa)
(cherry picked from commit d718593156cc7310105007f37645948c17637e0a)
(cherry picked from commit 53904e72f7c3b96e6ae5e24196d0e551fa8aebce)
(cherry picked from commit 3e6321d99607160d0d77bc63977619d5e1d28516)
(cherry picked from commit 77b033c8bf8c0a76ff0d7065e2192cbe55d3a3b6)
(cherry picked from commit c0a0e5b52240ed415d3b43ba77659821887bf50b)
(cherry picked from commit c65f76f56278f74082c4fa792ed49104d5d33c38)
(cherry picked from commit 07b2497664bd108dec84f6cfe43715540faf2688)
(cherry picked from commit 488e409a1898e9c739cc0bd24cb9791636dfd6b3)