ref: refs/heads/personal/oshneyder/fix-terminating-sess-from-sessdlg
