PMO-2838: refactored QueueServices
Merge remote-tracking branch 'origin/master'