Workaround for detecting intersections
Merge branch 'topic/intersect' into devel