(cherry picked from commit e86885cb)
(cherry picked from commit 57bb583c)
(cherry picked from commit b2362628)