NewFix_SOAP-2161

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