TRQ-2966 - speed up process data collection
Rework data collection and speed up collection
from TRQ-2331 commit