94ea053213
Merge commit 'cbaa463dd167ad9a1f0f4e1eba65bb3f0285db95' * commit 'cbaa463dd167ad9a1f0f4e1eba65bb3f0285db95': Switch to new improves shutdown class that is now in framework.