Merge branch 'dev' into 'main'

Add or change several things

See merge request watchtek-group/load-test!15