(cherry picked from commit f67a3f952cac7b9390b9dd2752bdf215a82e04b0)
(cherry picked from commit 23502a9b9fa92013d91295d8c9278601b31228c5)
(cherry picked from commit f8f345ae188fbf8f62e1471e7cc62a2db33d3e0e)
(cherry picked from commit e00eb6d9b32cbb294defb420e0305c544b9af239)
(cherry picked from commit f5f5eb53fa8cbd79473b3c6feccf54251c332f82)