Final of feature_double_press_exit branch