closes #6917