Merge pull request #1039 from david22swan/GH-1036/main/dependency_cycle