diff --git a/LICENSE-2.0.txt b/LICENSE-2.0.txt
index 2dbf8cf918..0f3822be4a 100644
--- a/LICENSE-2.0.txt
+++ b/LICENSE-2.0.txt
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2010 Google Inc
+   Copyright 2010 Google LLC
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/ortools/constraint_solver/csharp/routing.i b/ortools/constraint_solver/csharp/routing.i
index f146e67e43..c0f21e5503 100644
--- a/ortools/constraint_solver/csharp/routing.i
+++ b/ortools/constraint_solver/csharp/routing.i
@@ -81,19 +81,32 @@ namespace operations_research {
 %}
 // Ignored:
 %ignore RoutingModel::AddDimensionDependentDimensionWithVehicleCapacity;
+%ignore RoutingModel::AddHardTypeIncompatibility;
 %ignore RoutingModel::AddMatrixDimension(
     std::vector<std::vector<int64> > values,
     int64 capacity,
     bool fix_start_cumul_to_zero,
     const std::string& name);
+%ignore RoutingModel::AddSameVehicleRequiredTypeAlternatives;
+%ignore RoutingModel::AddTemporalRequiredTypeAlternatives;
+%ignore RoutingModel::AddTemporalTypeIncompatibility;
+%ignore RoutingModel::CloseVisitTypes;
 %ignore RoutingModel::GetAllDimensionNames;
 %ignore RoutingModel::GetDeliveryIndexPairs;
 %ignore RoutingModel::GetDimensions;
 %ignore RoutingModel::GetDimensionsWithSoftAndSpanCosts;
 %ignore RoutingModel::GetDimensionsWithSoftOrSpanCosts;
+%ignore RoutingModel::GetHardTypeIncompatibilitiesOfType;
 %ignore RoutingModel::GetPerfectBinaryDisjunctions;
 %ignore RoutingModel::GetPickupIndexPairs;
-%ignore RoutingModel::GetTypeIncompatibilities;
+%ignore RoutingModel::GetSameVehicleRequiredTypeAlternativesOfType;
+%ignore RoutingModel::GetTemporalRequiredTypeAlternativesOfType;
+%ignore RoutingModel::GetTemporalTypeIncompatibilitiesOfType;
+%ignore RoutingModel::HasHardTypeIncompatibilities;
+%ignore RoutingModel::HasSameVehicleTypeRequirements;
+%ignore RoutingModel::HasTemporalTypeIncompatibilities;
+%ignore RoutingModel::HasTemporalTypeRequirements;
+%ignore RoutingModel::HasTypeRegulations;
 %ignore RoutingModel::MakeStateDependentTransit;
 %ignore RoutingModel::RegisterStateDependentTransitCallback;
 %ignore RoutingModel::StateDependentTransitCallback;
diff --git a/ortools/constraint_solver/java/routing.i b/ortools/constraint_solver/java/routing.i
index cf5e8be2ab..998017c927 100644
--- a/ortools/constraint_solver/java/routing.i
+++ b/ortools/constraint_solver/java/routing.i
@@ -63,19 +63,34 @@ import java.util.function.LongBinaryOperator;
 import java.util.function.LongUnaryOperator;
 %}
 %ignore RoutingModel::AddDimensionDependentDimensionWithVehicleCapacity;
+%ignore RoutingModel::AddHardTypeIncompatibility;
 %ignore RoutingModel::AddMatrixDimension(
     std::vector<std::vector<int64> > values,
     int64 capacity,
     bool fix_start_cumul_to_zero,
     const std::string& name);
+%ignore RoutingModel::AddSameVehicleRequiredTypeAlternatives;
+%ignore RoutingModel::AddTemporalRequiredTypeAlternatives;
+%ignore RoutingModel::AddTemporalTypeIncompatibility;
+%ignore RoutingModel::CloseVisitTypes;
 %ignore RoutingModel::GetAllDimensionNames;
 %ignore RoutingModel::GetDeliveryIndexPairs;
 %ignore RoutingModel::GetDimensions;
 %ignore RoutingModel::GetDimensionsWithSoftAndSpanCosts;
 %ignore RoutingModel::GetDimensionsWithSoftOrSpanCosts;
+%ignore RoutingModel::GetHardTypeIncompatibilitiesOfType;
+%ignore RoutingModel::GetNumberOfVisitTypes;
 %ignore RoutingModel::GetPerfectBinaryDisjunctions;
 %ignore RoutingModel::GetPickupIndexPairs;
-%ignore RoutingModel::GetTypeIncompatibilities;
+%ignore RoutingModel::GetSameVehicleRequiredTypeAlternativesOfType;
+%ignore RoutingModel::GetTemporalRequiredTypeAlternativesOfType;
+%ignore RoutingModel::GetTemporalTypeIncompatibilitiesOfType;
+%ignore RoutingModel::GetVisitType;
+%ignore RoutingModel::HasHardTypeIncompatibilities;
+%ignore RoutingModel::HasSameVehicleTypeRequirements;
+%ignore RoutingModel::HasTemporalTypeIncompatibilities;
+%ignore RoutingModel::HasTemporalTypeRequirements;
+%ignore RoutingModel::HasTypeRegulations;
 %ignore RoutingModel::MakeStateDependentTransit;
 %ignore RoutingModel::RegisterStateDependentTransitCallback;
 %ignore RoutingModel::SolveWithParameters(
@@ -86,6 +101,7 @@ import java.util.function.LongUnaryOperator;
       const RoutingSearchParameters& search_parameters,
       std::vector<const Assignment*>* solutions);
 %ignore RoutingModel::TransitCallback;
+%ignore RoutingModel::SetVisitType;
 %ignore RoutingModel::StateDependentTransitCallback;
 %ignore RoutingModel::UnaryTransitCallbackOrNull;
 %rename (activeVar) RoutingModel::ActiveVar;
@@ -106,7 +122,6 @@ import java.util.function.LongUnaryOperator;
 %rename (addSearchMonitor) RoutingModel::AddSearchMonitor;
 %rename (addSoftSameVehicleConstraint) RoutingModel::AddSoftSameVehicleConstraint;
 %rename (addToAssignment) RoutingModel::AddToAssignment;
-%rename (addTypeIncompatibility) RoutingModel::AddTypeIncompatibility;
 %rename (addVariableMaximizedByFinalizer) RoutingModel::AddVariableMaximizedByFinalizer;
 %rename (addVariableMinimizedByFinalizer) RoutingModel::AddVariableMinimizedByFinalizer;
 %rename (addVectorDimension) RoutingModel::AddVectorDimension;
@@ -148,7 +163,6 @@ import java.util.function.LongUnaryOperator;
 %rename (getPickupAndDeliveryPolicyOfVehicle) RoutingModel::GetPickupAndDeliveryPolicyOfVehicle;
 %rename (getPrimaryConstrainedDimension) RoutingModel::GetPrimaryConstrainedDimension;
 %rename (getSameVehicleIndicesOfIndex) RoutingModel::GetSameVehicleIndicesOfIndex;
-%rename (getTypeIncompatibilities) RoutingModel::GetTypeIncompatibilities;
 %rename (getVehicleClassIndexOfVehicle) RoutingModel::GetVehicleClassIndexOfVehicle;
 %rename (getVehicleClassesCount) RoutingModel::GetVehicleClassesCount;
 %rename (getVisitType) RoutingModel::GetVisitType;
diff --git a/ortools/flatzinc/BUILD b/ortools/flatzinc/BUILD
index 2c51165d06..4706f5ef1f 100644
--- a/ortools/flatzinc/BUILD
+++ b/ortools/flatzinc/BUILD
@@ -1,5 +1,13 @@
+# Description:
+# Source code for the flatzinc interpreter. See www.minizinc.org.
+# This is a google owned implementation.
+
 package(default_visibility = ["//visibility:public"])
 
+# ---------------------------------------------------------------------------
+# Baseline flatzinc model.
+# ---------------------------------------------------------------------------
+
 cc_library(
     name = "logging",
     srcs = ["logging.cc"],
diff --git a/ortools/linear_solver/samples/SimpleLpProgram.java b/ortools/linear_solver/samples/SimpleLpProgram.java
index b27fd98c64..76a83dcb95 100644
--- a/ortools/linear_solver/samples/SimpleLpProgram.java
+++ b/ortools/linear_solver/samples/SimpleLpProgram.java
@@ -29,8 +29,8 @@ public class SimpleLpProgram {
   public static void main(String[] args) throws Exception {
     // [START solver]
     // Create the linear solver with the GLOP backend.
-    MPSolver solver = new MPSolver(
-        "SimpleLpProgram", MPSolver.OptimizationProblemType.GLOP_LINEAR_PROGRAMMING);
+    MPSolver solver = new MPSolver("SimpleLpProgram",
+        MPSolver.OptimizationProblemType.GLOP_LINEAR_PROGRAMMING);
     // [END solver]
 
     // [START variables]
diff --git a/ortools/linear_solver/samples/simple_lp_program.cc b/ortools/linear_solver/samples/simple_lp_program.cc
index e609795b31..24bd67898d 100644
--- a/ortools/linear_solver/samples/simple_lp_program.cc
+++ b/ortools/linear_solver/samples/simple_lp_program.cc
@@ -54,7 +54,7 @@ void run() {
   // [END solve]
 
   // [START print_solution]
-  std::cout << "Solution:" << std::endl;
+  LOG(INFO) << "Solution:" << std::endl;
   LOG(INFO) << "Objective value = " << objective->Value();
   LOG(INFO) << "x = " << x->solution_value();
   LOG(INFO) << "y = " << y->solution_value();