With email and part of prescription activity
Merge remote-tracking branch 'origin/Emailbranch' into newOne
Merge remote-tracking branch 'origin/master' into newOne