CSIT-559: Performance jobs reorganisation, part 3