Cherry-pick: Merge branch 'fix-circular-import-issue' into 'release/0.25'
Fix circular import issue
See merge request !215 (merged)
(cherry picked from commit 80406376)
2addbfb8 initial commit for circular import issue fix 17909cc1 circular import issue fix b10aea41 Added parition_id removal for AssociatedIdentities and sourceid