(cherry picked from commit 5b56a5533fd2621c977c7fef1679b30ad240bffe)
(cherry picked from commit b778762be9fda4066b126d48ec7e134e7b58a130)