Merge "Consolidate UserID+Package classes."