Merge branch 'dev/0.9.6' into 'main'

Dev/0.9.6

See merge request !63
27 jobs for release in 13 minutes and 45 seconds (queued for 6 seconds)