Merge branch 'richter-dev' into 'master'

Richter dev

See merge request !2
2 jobs for master in 23 minutes and 14 seconds (queued for 2 seconds)