Merge branch 'issue/94' into 'develop'

Issue #94: Update view join algorithm

See merge request !82
3 jobs for develop in 1 minute and 5 seconds (queued for 1 second)