Merge branch 'jc/index-output'