merged t1
merge t2
ticket:3 test fixes
ticket:3 settings update