collector tuning
Merge origin/master