Merge "Avoid reading at negative offsets"