Merge "Ignore shared user id and label" into main