ticket:6 view changed
ticket:6 links changed
ticket:8 merge with t6