Added templates for cyclic depdendency detection
Improved cyclic dependecy detection templates
Merge branch 'rc/2.0.0' into develop