intento to backport OAK-8118 to branch 1.10

[Tommaso Teofili]

Hi all,

I'd like to backport OAK-8118 [1] to branch 1.10.

Regards,
Tommaso

[1] : https://issues.apache.org/jira/browse/OAK-8118