Merge branch 'release-3.1'
Merge branch 'master' into develop
Rename confusing stop_on_exit