Merge "Fix bugs for nslcm"