CORE-3854 Imported resource name validation updates from 1.6.