Merge branch 'rs/log-email-subject'