Re #6924 Expand run ranges