fix TestMakeForm
migrate: improve _engine_choice_dialog
migrate: fix failing on utf8 in migration code
Merge remote-tracking branch 'fillest/master'
new field config