fix: #3582749 Fix direct use of entities in upgrade path

Closes #3582749

Merge request reports

Loading