Merge pull request #11990 from vinuvarshith/entity-unique-fields-api-call