Range-diff !157

back to !157 Merge when ready, and cancelling a queued merge

1:  36221f8 < -:  ------- Review comments on diff lines, and suggested changes
2:  787cf9e = 1:  7a968e5 Merge when ready, and cancelling a queued merge