Merge branch 'Branch_master' into 'master'

Branch master

See merge request !164
5 jobs for master in 12 minutes and 30 seconds (queued for 2 seconds)