Merge branch 'feature/merge_tifs' into 'master'

Feature/merge tifs

See merge request !6
2 jobs for master in 5 minutes and 46 seconds (queued for 2 seconds)