Follows up on #50753.
I think we should backport part of this to 3.27, just like #50753 is marked for backporting. For that reason, I split this change into 2 commits:

Doesn't add a new config option, just expands the scope of the already existing one.
Adds a new config option and deprecates the old one for removal.

It looks weird, but allows backporting just the 1st commit, which seems sensible to me. If you disagree with backporting any of this, I can squash the commits, which would make more sense.