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