Merge remote branch 'sebastian/exit-notice'