Resolve #3589933 "No"

Alex Pottrequested to merge
issue/entity_usage-3589933:3589933-no-id into 5.x

Closes #3589933

Merge request reports