Merge "Consider flags when merging with overlay semantics" into main