Merge branch 'hide_errors'