Merge "Defer UID data removal until after reading is finished" into sc-dev