closes #4046