Merge branch 'bb/diff-no-index-dotdot'