SOAP-2178

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