Merge branch 'new-year' into 'main'

here we go, new year

See merge request !6
2 jobs for main in 9 seconds (queued for 8 seconds)