Defined primitive types.
Merge branch 'feature-types' into develop