Implement 'Custom Data Types'
Merge branch 'mal' into dev