new partner
Merge branch 'new_partner'