Merge branches 'sh/email' and 'ls/processes'