Merge branch 'jt/diff-anchored-patience'