(cherry picked from commit 7c98a4c54e)
(cherry picked from commit 1ec4a8e6cf23691a595259d3d3e66a6b4b3962fa)
(cherry picked from commit 79de60a5d814ff8a0d475a3ce24bfe20c4e56ceb)
(cherry picked from commit e7fbfb34a900fa09f0828a5fa3cc6e93762d355a)
(cherry picked from commit 7f625d25a3497dffbfbf983d6d250dbcaac57c34)
(cherry picked from commit 9341e184276bf613518a7daf6c5b5e3298a0ad50)
(cherry picked from commit a03e449c01605835ca37b90df7eb5e7e2469a8ed)
(cherry picked from commit b4c7140bec360d6c3530756fcfe7d2777889e774)
(cherry picked from commit 685c9d4a874a34fecbdde7a47cece01c7a9bd22d)
(cherry picked from commit 48b3594a7deb99b2fdb7d9f76dc5cbd123a1db2c)
(cherry picked from commit 8eefd84d386744c4649d71ae017041ee4fe4ee2e)
(cherry picked from commit d42f1028eba5cf7d8ebac12e5858ea669143c76a)
(cherry picked from commit 3bb7f7ed51bff4054aca72d2763c927956392c19)
(cherry picked from commit ac109696e7dc10afa50c43df16497ead4236a1d5)
(cherry picked from commit d39713efb4ff3053e69be8015642bbc000928309)
