Merge branch 'index-grafts-draft-submission' into cutting-edge