Merge branch 'dev' into 'master'

Fix: False positive self-intersection errors

See merge request !5
1 job for master in 1 minute and 7 seconds (queued for 3 seconds)