(cherry picked from commit 2f95143000e4ccc94ef14332777b58fe778edbd6)
(cherry picked from commit cf77f1e6d96f4456a25d7375012a7181fb1bcce4)
(cherry picked from commit 0983b62ca007a6c270aff366c338a21ce6e105ce)
(cherry picked from commit 6f7905c8ecf17d5f74ac9a71a453d6768c212b6d)
(cherry picked from commit 2a958031a9dc0b489a8fde85278a1d02ffb3169c)
(cherry picked from commit 946d209f4688691e2e030229b1a428338733c086)
(cherry picked from commit 08be2b226e46d9f41e08f66e936b317bcfb4a257)
(cherry picked from commit 9a0f6315da038493dda98875b3a395e21d267693)
(cherry picked from commit 2f264eeeec3ec5a0724d4faf7553d0daad47817b)