Merge "Updates MatchFlagTests to account for changed logic" into rvc-dev