Fixed index error
Merge remote-tracking branch 'origin' into release