Conflict resolution with JR on PR
Merge branch 'johnrosswvsu-feature-sponsors-view-27' into develop