[ECS 0.9.0] Part of CompanionGameObjectUpdateSystem not working

The following code in CompanionGameObjectUpdateSystem doesn’t work:

var toDeactivate = Entities.WithAny<Disabled, Prefab>().WithAll<CompanionGameObjectActiveSystemState, CompanionLink>();
toDeactivate.ForEach((CompanionLink link) => link.Companion.SetActive(false));
EntityManager.RemoveComponent<CompanionGameObjectActiveSystemState>(toDeactivate.ToEntityQuery());

because entities with Disabled or Prefab tag will not be included in entitiy query result. Adding .With(EntityQueryOptions.IncludeDisabled | EntityQueryOptions.IncludePrefab) to toDeactivate fixes this.

Sorry, wrong forum