Merge branch 'wip/smcv/better-assertions' into 'master'

Use better assertions

See merge request !3
4 jobs for master in 2 minutes and 11 seconds