Merge "Added external-key and resource-name custom fields"