Merge branch 'dev-v2' into 'master'

Dev v2

See merge request !36
1 job for master in 2 minutes and 22 seconds (queued for 2 seconds)