Hi, I intend to backport the fix for OAK-8936 to the 1.22 branch.
The fix is a one-line change in the code with some new test code to cover the bug and the bugfix. I consider this a low-risk change. A patch describing the change is attached to OAK-8936 and is visible at [0]. [0] - https://issues.apache.org/jira/secure/attachment/12995759/OAK-8936.patch -MR