Merge branch 'vb/sendemail'