(cherry picked from commit e5cc2e2a96245d878274004fa4bf203bcf0cf37e)
(cherry picked from commit 62dd0f10)