Merge branch 'index-out-of-bounds-fix'

Closes GH-48
Status Job ID Name Coverage
  Analysis
canceled #40628
maven
checkstyle

 
  Test
canceled #40629
maven
test

 
  Build
canceled #40630
maven
package

 
  Synchronization
canceled #40631
git allowed to fail
sync_mirror