ticket:4 client fix
Merge branch 't4' into t5
Merge branch 't5' into t6