Merge branch 'dev' into 'master'

Dev

See merge request !2
2 jobs for master
in 5 minutes and 6 seconds and was queued for 1 second