Fix circular import problems

[AdeelH]

Overview

This PR fixes some circular import errors.

Checklist

• Added unit tests, if applicable
• Updated documentation, if applicable
• Added needs-backport label if the change should be back-ported to the previous release
• PR has a name that won't get you publicly shamed for vagueness

Notes

N/A

Testing Instructions

N/A

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (cf95e94) 89.75% compared to head (6bbca60) 89.69%.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #2059      +/-   ##
==========================================
- Coverage   89.75%   89.69%   -0.07%     
==========================================
  Files         196      196              
  Lines        9735     9735              
==========================================
- Hits         8738     8732       -6     
- Misses        997     1003       +6     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.