Resolve conflicts main<--develop (#121)

## Description
Merging main onto develop as a pre-req for #120

---------

Co-authored-by: Privilege Mendes <[email protected]>
Co-authored-by: Axel Verheul <[email protected]>
Co-authored-by: Xabier <[email protected]>
Co-authored-by: Xabier Almazor <[email protected]>
Co-authored-by: Xabier Almazor <[email protected]>
Co-authored-by: Wietze <[email protected]>
Co-authored-by: Xabier Almazor Telek <[email protected]>
Co-authored-by: Nick K <[email protected]>
Co-authored-by: Nick Koster <[email protected]>
Co-authored-by: Pandelis Symeonidis <[email protected]>
Co-authored-by: Pandelis Symeonidis <[email protected]>
Co-authored-by: MangoDream1 <[email protected]>
Co-authored-by: Synthetics <[email protected]>
Co-authored-by: Synthetics <[email protected]>