TypeHelper.GetBaseType
Merge remote-tracking branch 'origin/dev2' into dev2
Fix build error caused by bad merge.