SOAP-2291

https://smartbearsweden.atlassian.net/browse/SOAP-2291