Initial work on entity usage 5.x compatibility

Closes #3607645

Merge request reports

Loading