Synchronise main and develop commit history

[CDR-AndrewG]

Checklist: (Put an x in all the boxes that apply)

• I have read the CONTRIBUTING document.
• My code follows the code style of this project.
• I have updated the documentation accordingly.
• I have added tests to cover my changes.
• All new and existing tests passed.
• I have checked that there aren't any other open Pull Requests from the same change.
• The develop branch has been set as the base branch to merge changes of the pull request.
• I have updated the CHANGELOG.md file as appropriate.

What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)
Synchronise main and develop commit history

What is the current behavior? (You can also link to an open issue here)

What is the new behavior? (if this is a feature change)

Does this PR introduce a breaking change? (What changes might users need to make in their application due to this PR?)

Other information:

[CDR-AmirM]

LGTM