bulk email monor change
merge conflict fixed
minor change
Merge pull request #424 from akhileshdarjee/4.0-hotfix

Minor changes