remove hardcode datapath
return list os paths instead of set
Merge branch 'master' into develop