Merge "fix NS heal serializer error"