add more warmup code
Merge branch '2.0-maint' into 2.1-maint
remove logger from warmup class
Merge branch '2.0-maint' into 2.1-maint