closes #7146