pick: match tags (#5147)

[kylezs]

Pull Request

Picks #5147 into main

Checklist

Please conduct a thorough self-review before opening the PR.

• [x] I am confident that the code works.
• [x] I have written sufficient tests.
• [x] I have written and tested required migrations.
• [x] I have updated documentation where appropriate.

Summary

Picked from release - is hacky, but this should be resolved by PRO-1486

[codecov[bot]]

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Project coverage is 71%. Comparing base (6fd367f) to head (5d53bac).

Additional details and impacted files

```diff @@ Coverage Diff @@ ## main #5148 +/- ## ====================================== - Coverage 71% 71% -0% ====================================== Files 460 460 Lines 81876 81732 -144 Branches 81876 81732 -144 ====================================== - Hits 58416 58213 -203 - Misses 20369 20423 +54 - Partials 3091 3096 +5 ```

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.