Merge "Adjust datetime in email confirmation email"