AOP for email and Logs
Merge origin/master