(cherry picked from commit e17f2df9) (cherry picked from commit 9a2f3313) (cherry picked from commit 08acf27f)