Merge pull request #3226 from esdrubal/soap_headers_fix