This is not a documentation change.

Can this be in it's own PR, with maybe a regression test for whatever it's fixing?