perf: remove the need for performing additional entity loads

Closes #3582044

Merge request reports

Loading