Intent to backport to 1.4: OAK-4867

[Julian Reschke]

<https://issues.apache.org/jira/browse/OAK-4867>

This is in 1.6 and is a prerequisite for further backports...