Merge "Ensure the resource name is validated"