NewFix_SOAP-2049_and_SOAP-2107

https://smartbearsweden.atlassian.net/browse/SOAP-2049
https://smartbearsweden.atlassian.net/browse/SOAP-2107