[OE-4643] filter settings service
[OE-4643] add settings to existing queue sets
[OE-4643] merged develop into feature
Merge branch 'jira/OE-4643' into develop