case 2241 - Notices fix.
Merge branch 'case-2241' into develop