Intend to backport OAK-9065 to 1.8, 1.10, and 1.22

[Thomas Mueller]

Hi,

I intend to backport the fix for OAK-9065 to the 1.8, 1.10, and 1.22 branches. 
The risk should be very limited.

Let me know i you have any concerns.

Regards,
Thomas

https://issues.apache.org/jira/browse/OAK-9065