CSIT-557: Performance jobs reorganisation, part 3