Merge "Include type service as type system" into oc-dev