Merge "Fix notification HSUM bug" into main