Merge "Drop circular dependency" into main