Merge new openclosewindow exit strategy into master