(cherry picked from commit 0caaa4d46c7fbd226e6744d073cbeeff55ef5a15)
(cherry picked from commit c6e3325c5fc233470f4e4292f88eea8c7923de13)