Merge branch 'rivet-302' into 'master'

Test Rivet 3.0.2

See merge request !301
4 jobs for master in 5 minutes and 50 seconds (queued for 1 second)