(cherry picked from commit 35b96a9d)
(cherry picked from commit e0083264)
(cherry picked from commit 84b04888)