closes #6584