Merge "Fix serialization bug of nslcm"