[sr-dev] git:master:315be997: Merge pull request #1067 from mslehto/filter_server_id