Merge branch 'sg/diff-indent-heuristic-non-experimental'