Fix DataBlock::operator[]
Merge branch 'fix_datablock' into develop