#3561000 - Added context entity resolver

Closes #3561000

Merge request reports

Loading