Merge branch 'block-error-warning'