Merge pull request #1002 from valentinewallace/2021-07-fix-features-index-bounds