Merge "Fixed crashes due to HSUM issues" into main