closes #4347