Comment 15 for bug 1829295

From the four people who have noted a need for this behavior change to be optional, does an org unit setting seem appropriate here?

That seems a better fit than a global/internal flag here.

An org unit setting as a boolean for opting in to the "old" (current) behavior, documented in the release notes? Sites upgrading would gain the new functionality unless they took action to prevent it.

Since this is something we would need to remove locally if it were committed as-is without a setting to disable, I'm willing to put a branch together so that this can be merged.

Does the above sound reasonable?