more temporary printouts to see why update workload for 2.1 never finishes
Merge branch '2.0-maint' into 2.1-maint
Merge branch '2.1-maint'