Long wait time at shutdown

This was mentioned in last stable announcement: