add forceable exit for testing
Merge branch 'dev'