Merge branch 'master' into 'dev'

Update dev

See merge request !9
1 job for dev_bht in 1 minute and 5 seconds (queued for 4 seconds)