Merge "Enhance WspTypeDecoder to decode Content Type Parameters"