closes #4496