closes #5893