(cherry picked from commit fd42d40981a6855acef35c1f15607869d2015549)
(cherry picked from commit c6e3325c5fc233470f4e4292f88eea8c7923de13)