(cherry picked from commit 9fd5b1e5618a6ad19638494b480460e9527debde)
(cherry picked from commit 812e34fd7834e828bebd3f79440f831d188a1a99)
(cherry picked from commit 283adb1a30e6b51ab6603488e57b9997a0ca83f0)
(cherry picked from commit cb2e659baad5e4fe853c124dafe32491335b8232)