Fix to #24953 - Different orders of Include()/Where() in queries produce different results #25716
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem was that we were not merging includes for the EntityReference that we retrieve from foreign key expansion cache. If the translation was added to the cache before all the includes were marked and more includes were added afterwards, those includes would be lost.
Fix is to merge includes just like we do for the scenario where we need to expand the FK translation.
Fixes #24953