closes #4486