Consolidate migrations
correct initial schema
Add correct schema
Merge pull request #5173 from remcohh/develop

Consolidate migrations