block size change
Merge branch 'blockSizeChange'