SOAP-2333

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