Handle unset CL on statements when printing/logging
Don't submit tasks to executor after shutdown
Merge branch '1.x'