closes #4497