ticket:7 merged with 6 ticket
ticket:7 merge style