D12 3.x

Lee Rowlandsrequested to merge
issue/dynamic_entity_reference-3605219:3605219-3.x-d12-branch into 3.x

(cherry picked from commit 6c6016f2)

Closes #3605219

Merge request reports