Merge branch 'develop', new schemas added, minor fixes
Merge branch 'master' into develop