fixed blocked cell parsing
Merge branch 'dev'