Merge pull request #22830 from kurund/entityRef-enhancements