Merge branch '1851_fix_migrate'