Merge "Fix circular dependency." into main