branch from tag 0.9-11, for wsdl fix.