Intent to backport OAK-7356

[Angela Schreiber]

Hi

I would like to backport https://issues.apache.org/jira/browse/OAK-7356.

Please let me know if you have any concern/objection.

Kind regards
Angela