Merged Block and Chunk from master.