(cherry picked from commit 2d6e97e0cbfb8bdcf87a2e5ad19bd59fc8f5405d)

(cherry picked from commit 5dce2adc2871e6814dbf42a658e6b364f4dc6641)

(cherry picked from commit f25d76730b175fb680aa2770fb20a67fd858ffbb)

(cherry picked from commit 2a8901ff953004a2fc7cebde86bae6575cec2924)

(cherry picked from commit db50f282bab1e98397cc7434a811b8b7da2fe6dc)

(cherry picked from commit 6684f7c7faa15d6d59df35fbff9ea6666634d754)

(cherry picked from commit fd3c68cd1a39e059180c35c1d56ffa33ef4dfde4)

(cherry picked from commit 2b153ed074811e735aaa58d57a3fcdf7838e17f5)