Merge branch 'master' into t5_edit
ticket:5 create test for ticket 5
Merge branch 't5_edit'