SOAP-752: Fixed adding of template parameters