Fixed circular dependency dev issue - Close #220