Merge "fix NS instantiation serializer error"