Update cfr topology to support one topology
Merge branch 'master' of https://github.com/Yunrui/TaoTie