ticket:5 last modifications
Merge branch 't5_edit'