Merge dev to prod and resolve conflicts
@DSASanFrancisco/portal-members
Summary
Not sure why there are conflicts in the first place, but this resolves the conflicts by taking the changes on dev. They appear to be correct and more up-to-date with the latest changes.