#3589600 Use loadByEntity to set Canonical.

Closes #3589600

Merge request reports

Loading