Merge branch 'error-explanation'

Closes #11077 [ci skip]