Merge "Fix unexpected circular dependency check"