Merge "Fix NS scale serializers error"