--notice fixes for CRM-12018
Merge pull request #79 from pradpnayak/CRM-12018

--notice fixes for CRM-12018