Merge "TYPE_DATE and TYPE_DATE_TIME should be considered as the same type"