Merge branch 'block'