Merge "Fixing circular dependency"