First commit of DataCollector
Merge sbs2-DataCollector