Patch for NXP-11348

See https://jira.nuxeo.com/browse/NXP-11348