Merge "Fixes error when same class is in two loaders" into studio-1.3-dev