Merge branch 'restart-cleanup' into restart