(cherry picked from commit 7f3bf53e4ce37e8fd286ede4ca0298aeb9ca217a)
(cherry picked from commit c6e3325c5fc233470f4e4292f88eea8c7923de13)