The fix of #5119 didn't end up in the 22.3 release tree. We'd like to backport this fix to 22.3.1 if possible.
The change applies cleanly to the 22.3 tree, we've backported it to our mandrel/22.3 branch already. I'd be happy to create a PR targetting the release branch for this.
/cc @gilles-duboscq @ezzarghili as per #4332 (comment)