Fix source file cycle group bug
Merge branch 'FilterSourceCycle' into develop