Issue #3554878 by mably: Fix circular dependency error

Frank Mablyrequested to merge
issue/domain-3554878:3554878-fix-circular-dependency into 3.x

Closes #3554878

Merge request reports