Merge "Move class RangeDifference to own file"