- Backport MC-229191 ore distribution changes