Closes #533 (closed) and #698 (closed) Influences #713 (closed)
Migrate partners to new template
This will create a new commit in order to revert the existing changes.
