Merge "Fix NS Scale serializers error"