Merge "Fix UserHandle" into main