[CHG] fileset test
Merge branch 'master' into dev