This PR is to merge master branch into v5 workstream branch after resolving the conflict and MAE-515-merge-master-branch was created to resolve the conflict between master branch and membership extras v5 workstream branch.
The conflict that required resolving manually was from this commit.
Notes
The reason for using merge instead of rebase is that we want to keep the history of the commits.
Overview
This PR is to merge master branch into v5 workstream branch after resolving the conflict and MAE-515-merge-master-branch was created to resolve the conflict between master branch and membership extras v5 workstream branch.
The conflict that required resolving manually was from this commit.
Notes
The reason for using merge instead of rebase is that we want to keep the history of the commits.