closes #7181