Merge branch 'equivalence-patch' into 'master'

Equivalence patch

See merge request !12
2 jobs for master in 2 minutes and 41 seconds (queued for 36 seconds)