bro 2.3.1

Closes #33580.
Is the change small enough to backport as a patch?