Merge "Fix incorrect gid config leads to process/system cannot start." into main