Synced with melamid, fixed bugs of labeling of nulls and redundant labeling.