Merge branch 'block-summary'