require FileReference only for specific clients, refs #4780
Merge branch 'master' into estructura