CSIT-558: Performance jobs reorganization, part 2