CLSN-865 code review till July-13
email service name changed