Fix confirmation/waiting emails
Merge remote-tracking branch 'origin/develop'