Merge branch 'primitive-restart-cleanup'