This PR is to update version 5 workstream branch with master branch.
The MAE-376-merge-with-main-branch was branched from MAE-376-version5-workstream branch then merge with current master branch to check if there is any conflict to be resolved.
The reason that the merge has been used rather than rebase as in this case, we would like to preserve the history of commits.
Overview
This PR is to update version 5 workstream branch with master branch.
The MAE-376-merge-with-main-branch was branched from MAE-376-version5-workstream branch then merge with current master branch to check if there is any conflict to be resolved.
The reason that the merge has been used rather than rebase as in this case, we would like to preserve the history of commits.