bro 2.3.1

Closes #33580.
Ah! I :heart: single patches. Thanks for hunting that down. So much nicer to integrate. Shall backport now.