Merge branch 'dev' into 'master'

Fix: False positive self-intersection errors

See merge request !5
1 job for dev_event_bus in 1 minute and 2 seconds (queued for 1 second)