Merge branch 'richter-dev' into 'master'

Richter dev

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