Merge with feature/ragistration_confirmation_mailer branch and resolve merge conflicts.