#4599

Requires a bit more effort than most backports since the original PR uses 1.21.2 render states in testmodClient

I do not have time to work on this currently, but if this is open in a few weeks I can PR.