Resolving referenced entity issues

Tom Howardrequested to merge
issue/tmgmt-3512738:3512738-translating-referenced-entity into 8.x-1.x

Closes #3512738

Merge request reports