(cherry picked from commit acf06f45)
(cherry picked from commit 768eb918)
(cherry picked from commit e7f64191)