(cherry picked from commit 47e7009af6a01bce815dcb722c484ee7b3073426)
(cherry picked from commit 6fe0b8ba71784d26d46624cc0494de9de930ecad)