ticket:5 fixes according to the comments
Merge branch 't5_edit_form'