Resolve conflicts main<--develop (#121)

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

---------

Co-authored-by: Privilege Mendes <20317699+privilegemendes@users.noreply.github.com>
Co-authored-by: Axel Verheul <axel@kryha.io>
Co-authored-by: Xabier <146219902+snthtcs@users.noreply.github.com>
Co-authored-by: Xabier Almazor <xabier@Xabiers-MBP.home>
Co-authored-by: Xabier Almazor <xabier@Xabiers-MBP.localdomain>
Co-authored-by: Wietze <wietze@kryha.io>
Co-authored-by: Xabier Almazor Telek <xabier@kryha.io>
Co-authored-by: Nick K <nick.koster@gmail.com>
Co-authored-by: Nick Koster <nick@kryha.io>
Co-authored-by: Pandelis Symeonidis <pandelis@kryha.io>
Co-authored-by: Pandelis Symeonidis <54764628+Pandelissym@users.noreply.github.com>
Co-authored-by: MangoDream1 <MangoDream1@users.noreply.github.com>
Co-authored-by: Synthetics <snthtcs@Syntheticss-MBP.localdomain>
Co-authored-by: Synthetics <snthtcs@Syntheticss-MBP.home>