Code

Merge branch 'jc/index-extended-flags'