intend to backport OAK-8855

[Angela Schreiber]

hi

i would like to back port the fix for 
OAK-8855<https://issues.apache.org/jira/browse/OAK-8855>.
let me know if you have any concerns.

kind regards
angela