Merge branch 'mp/t7060-diff-index-test'