Code preparation for on-demand clusters
Record statistics of scratch usage
Increase connection timeout