Drain before shutdown

Recreated because I rebased the changes onto current SNAPSHOT