Merge PR dropping 3.7 into Develop

[ALescoulie]

Description

Provide a brief description of the PR's purpose here.

Todos

Notable points that this PR has either accomplished or will accomplish.

• [ ] TODO 1

Questions

• [ ] Question1

Status

• [ ] Ready to go