Merge "Add cyclic dependencies check"