Backport 7dea2b92abad957004e57030963dcb0f458286ac