use expand in processresources
Merge branch 'master' into develop