Merge "Update ukey2 references" into main