Merge pull request #4267 from amet/close_subs_window_on_stop