(cherry picked from commit b12aefe46ed0dd9ff42de3e1fa4cc2ccc6d491b1)
(cherry picked from commit b0984c901369dd45091cbe03448aedcab9573627)