Backport "Restrict captureWildcards to only be used if needed" #16929
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.
Backports #16799 and #16732
The first PR was marked as needing backporting to 3.3.0 even though it fixed a regression that first appeared after branching off the release branch for 3.3.0. It relied on the changes from #16732, so I also cherry-picked them.
I don't remember exactly why we decided to backport those changes, so I'm leaving it to @dwijnand to decide.