Moving asset schema declaration to collections
Merge branch 'develop'