(cherry picked from commit d6170dbfedf27a6218afe242a0fae2eb8b368aec)
(cherry picked from commit 58ddbcd77e17ef95ecfad4b746084ee9326116f3)