(cherry picked from commit 805b4d0e7ca5fa709bf8c37db5494f104ff14b0f)
(cherry picked from commit b5dcfb9cf26eebff92094854f5f6c0feec79952b)