SOAP-255 changes