Merge "add nsi name info to an and cn"