Merge "Fix two mistakes in art script rewrite."