Merge branch 'dev' into 'testing'

new feature should be available as soon as possible

See merge request !150
3 jobs for testing in 1 minute and 28 seconds (queued for 1 second)