Merge branch 'jp/index-with-corrupt-stages'