Thank you for this fix.

I build a local 6.2 SNAPSHOT release and tested the one failing test case locally: it fixes the issue. Successfully validated!

I didn’t find a public snapshot build, so I wasn’t able to run the full tests suite on a CI system against 6.2 SNAPSHOT.