PMO-2497 - Renaming of new collectors
Merge remote-tracking branch 'origin/master'