-BZ-1171641: adding loading for data grids
-BZ-1168891: filter all tasks based on logs
-BZ-1168891: merging with 6.2.x