from jet
bug fix with terminate app
Merge remote-tracking branch 'origin/develop' into jet
bug fix: terminate app