Merge "Improve documentation for different block types"