Merge "Add ID_LENGTH field for Empty type record"