UHM-1183: Allow filtering by multiple services on the Schedule View
Merge remote-tracking branch 'origin/master'