more printouts for debugging 2.1 update workload
Merge branch '2.0-maint' into 2.1-maint