SOAP-1999

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