Merge branch 'dev' into 'master'

Version 3.15.0

See merge request !8
1 job for master in 3 minutes and 15 seconds (queued for 5 seconds)