Merge branch 'jk/diff-no-index-initialize'