Merge branch 'ls/shutdown'