Merge "Fix entry handling for 0 length entries."