(cherry picked from commit 7b87d8f7e226cce63356e721adf04a9c757d6f14)
(cherry picked from commit fa3f97f1c18243104067513b93800dd76f108af3)