support resource remapping for built-in assets
Merge branches 'master' and 'resources-remapping'