Merge branch 'master' into block-error-warning