ticket:10 merge t6