case 2241 - Couple notices fix.
Merge branch 'case-2241' into develop