(cherry picked from commit 97606f9d1d511cf76431843a989ed76bed9f39db)
(cherry picked from commit bf052b4904918913250a7108e704ef5ac4f1c725)