-- notice fixes for CRM-12284
Merge pull request #448 from pradpnayak/CRM-12284

-- notice fixes for CRM-12284