cleanup on interrupt
Merge branch 'master' into feature/parallel