Finally fixed initial migration.
Merge branch 'integration' into favorites