Merge "Take into account that we might end up with unresolved classes."