Merge "Use new ResourceLoader namespace"