(cherry picked from commit 5e9d9cd83ecda309d6f62f0425b8086d62944802)
(cherry picked from commit 1a9fd661c3b7b650c1841b615aa485ace014e3f3)