Merge "Only consider flags that affect strategy when matching attributes." into main