(cherry picked from commit 28c0f327cf1f67a53899f8590e9b85aacd485c39)
(cherry picked from commit 1b532f16c79c52b1e03fdf1dd73723542cb70d78)
(cherry picked from commit 6e35d3ffb1a28b5622194866554d3821a4c82b09)
(cherry picked from commit 3e6ba3b3b7d4552f308db08a202ab568a7ece719)
(cherry picked from commit d47d8dd9662a4a1e84de22ba90b41da216b13dbf)
(cherry picked from commit 2716166cd4d96d870275ba04ad5811b79dca4272)
(cherry picked from commit 50c67cb9062f51df8628327234cb3474f50dd93b)
(cherry picked from commit ba0049afc1da6d766b0a37a3a8ca1175e2d98eb4)
(cherry picked from commit 80e010e813b2c268d09a25b928230adda3149736)
(cherry picked from commit 4266fe41a231c9347636e543bde68af20ddf3781)
(cherry picked from commit efe94735464d5489579915ffd0a05de76f8ec103)
(cherry picked from commit 3d79d2ee47aff623642ebb2b9a0ca67a25467b43)
(cherry picked from commit b56ad0325a)
