chore: merging dev into staging

[Dev-Tonia]

​

Description

​Merging the changes on the dev into staging

Related Issue (Link to Github issue)

​

Motivation and Context

​

How Has This Been Tested?

​

Screenshots (if appropriate - Postman, etc):

​

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)
  ​

Checklist:

• My code follows the code style of this project.
• My change requires a change to the documentation.
• I have updated the documentation accordingly.
• I have read the CONTRIBUTING document.
• I have added tests to cover my changes.
• All new and existing tests passed.