closes #4495