Mock fileserver up and running
Merge remote-tracking branch 'origin/data_beta' into data_beta