Merge branch 'dev-v3' into 'master'

Version 3

See merge request !51
1 job for master in 2 minutes and 47 seconds (queued for 1 second)