Merge "Adjust UUI to latest"