Fix discriminator value used in OfType support
Fix unit test for OfType support
Update version