Added missing migration
Merge branch 'master' into stable