Merge branch 'jc/index-v4'