Merge "Fix legacy orange."