Merge `dev` into `main`

Added some things, fixed some things, made sure everything's ok

Merge request reports

Loading