Changes at partners area.
Merge branch 'feature/193-partners-more-changes' into staging