Merge pull request #7675 from mbauskar/hotfix

[minor] index out of range fixes for JE