case 3697 - Fix notices.
Merge branch 'case-3697' into develop