Refs #7923. Minor edit
Merge branch 'feature/7923_DGS_comment' into develop