ticket:13 refactoring
Merge branch 't13_customer'
ticket:13 refactoring
Merge branch 't13_customer'