Merge branch 't5_form'
fixes
ticket:5 migration fixes