Merging branch erika/partner-badges into master