HAP-492 - Custom staging configuration is delaying the job page loading
Merge remote-tracking branch 'origin/master'