Merge branch 'bug/JAL-1988_JAL-3772_improved_quit_handling' into merge/JAL-1988_JAL...