All commit authors signed the Contributor License Agreement.

It is customary to ask on the issue if one can create a PR for the patch before doing it, especially if someone is already assigned to the issue. If the assignee has already started working on it, it should be done so to avoid synchronization issues. Sorry, but I will close the PR for now (in addition, tests seem to be broken by this change) (you can still work on it on your fork but we try to avoid open PRs sitting there).

If the assignee wants to delegate the work, I'll re-open the PR (but the tests need to pass, and regression tests must be added as well)

The check in crval.c is wrong.

You need to move the following checks into this line. So it should be a nested if.

@picnixz I'm helping the OP with creating a PR for this. So I let them take the issue.