Merge branch 'sh/shutdown'