Merge branch 'option_near_tafforensis' into 'master'

Composite cor finder

See merge request !182
4 jobs for master in 7 minutes and 5 seconds (queued for 28 seconds)