(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 09c596b3c3f319ec82affdbfde6f2ea6f14ba4ef)
(cherry picked from commit b7611172584e0cd378b4c7676b2b22908b4a1b8f)
(cherry picked from commit 45c9dc8f20c27180f7d84b66d92de0a6cb8bfc77)
(cherry picked from commit 861fb8ee61)
