Issue #2216371: also fix the issue that this bug was about (make sure items with parents not in feature are included)