(cherry picked from commit 027b93ae5f1efe713dc213d56f0f2e4d9858db54)
(cherry picked from commit 7b0057f41f29bc18608e812bde551e19c994dbe1)