Merge branch 'improve-filecollection' into 'master'

Improved file selection and referencing files without reading in FileCollection extension

See merge request !369
1 job for master in 6 minutes and 45 seconds (queued for 30 seconds)
Status Job ID Name Coverage
  Test
passed #81074
test

00:06:45