Merge "Fix "argument list too long""