ReallyFix_SOAP-2058

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