Merge branch 'feature-NXP-12031' from multiple repositories

Repositories:
	nuxeo

Repositories without this branch:
	nuxeo-services
Merge branch 'feature-NXP-12031' from multiple repositories

Repositories:
	nuxeo

Repositories without this branch:
	nuxeo-theme
Merge branch 'feature-NXP-12031' from multiple repositories

Repositories:
	nuxeo

Repositories without this branch:
	nuxeo-webengine