Comment out types
Merge branch 'develop'