Merge "Revert "Add support for UIDs in bootstrap atoms"" into main