Merge pull request #9185 from jitendrapurohit/CRM-19352-notice-fix