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