Partners changes.
Merge branch 'feature/147-partners-changes' into staging