Backport 333b6350753c7ca87b0810a05940b214bd3ec710