(cherry picked from commit 7cf5e7e4c84936deedd907a0dca7f331ba5b1fa4)
(cherry picked from commit 8373c8893a40210ba1581b53efc062854accd26f)