Fixed issue with main database migration numbering
Merge branch 'origin/dev'