ticket:5 fix migration
Merge branch 't5_edit'