core-4936 fix corner cases with header and skip rows.