(cherry picked from commit 0800bd5b3df103f23cb80ec916fe037fb701ccad)
(cherry picked from commit e175ba353e4fb39aa18b0139f76e72e36957b68b)