Merge "Fix NS update serializers error"