Fix resource package builder
Merge branch 'develop'