Intent to backport OAK-8118 and OAK-8819 to the 1.8 branch

[Tommaso Teofili]

Hi all,

If no one objects, I'd like to backport OAK-8118 [1] and OAK-8819 [2]
to the 1.8 branch.

Regards,
Tommaso

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