(cherry picked from commit 2efe5ee68b3b067ba758d6bfb2f8b51af3490811)

(cherry picked from commit 501cb13f00a9a5736c56e33c273890843320f17c)

(cherry picked from commit 3d87555b69ff2f99d23920edaa22fa4e70069c35)

(cherry picked from commit 8b46db686a4c45b242deaa50d5e227d250ccbbcb)

(cherry picked from commit b580e0779f29f4698b9127d679b43b0886427f8d)

(cherry picked from commit 80d535f9a1afa76ef20293884d7723396cfb2c0b)

(cherry picked from commit 91ed0475fce431322bef33e0ccb2465d2213f87f)