[sr-dev] git:master:9811e318: Merge pull request #1412 from armenb/ws_cid85650_fix