Merge "Fix magic $ aliasing in ResourceLoader"