Cherry-picked d563c281eddd7326ce1c452bf897bae1aba52114 (SOAP action quotes)