Merge "Only clear UID-based structures when UID is fully gone." into sc-dev