closes #4231