(cherry picked from commit 8dc8952b37f8bc8db9dfd62bd2bbb390463da5d1)
(cherry picked from commit 002db7f2e1d794e68a3025a1383ca1658686a8c2)