done loading
Merge branch 'resource_loading' into core