Merge branch 't/exit_fix'