Merge "Refactoring string uid vectors"