Dgalvez/fix greedy batch strategy name r2.0.0rc0
This PR is stale because it has been open for 14 days with no activity. Remove stale label or comment or update or this will be closed in 7 days.
Same as #9242, but for r2.0.0rc0 branch.