Change resolved_primary_entity
helper signature
#1485
Merged
resolved_primary_entity
helper signature
#1485