Merge "Fixed the incorrect uid check for HSUM mode" into main