Merge branch 'dev' into 'main'

* merge dev with latest fixes

See merge request !3