Code

Merge branch 'jc/index-update-if-able' into maint