Merge branch 'feature/7-sponsors' into staging