Broken the original logics into three collectors
Merge branch 'yq-develop'

Conflicts:
	AbstractStatCollector.h