Intent to backport to 1.6 and 1.4: OAK-5741

[Julian Reschke]

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

(needed for a subsequent backport of OAK-5704)