Merge "Fix parcel read/write mismatch" into main