Merge branch 'vb/sendemail' into next