(cherry picked from commit 080a6027) (cherry picked from commit 98365420) (cherry picked from commit 08f82976)