Issue #1650, service filters were filtering out everything
Merge remote-tracking branch 'origin/master'