cBlockInfo-related changes from #723
Merge pull request #770 from xdot/master

cBlockInfo-related changes from #723