Merging in developemnt branch

For email notification support