Hi I'd like to backport OAK-8870 [1] to the maintenance branches. The fix is simple and I consider the risk associated with the backport as low. Let me know if you have any concerns.
Kind regards Angela [1] https://issues.apache.org/jira/browse/OAK-8870
