Merge branch 'ab/send-email-catfile'