Refs #6840  Fixed problem
Merge branch 'feature/6840_errors' into develop