Merge branch 't4' into t5
ticket:5 form initiation fixed
Merged
merged
Merge branch 't8' into t9