case 3697 - Minor improvements.
Merge branch 'case-3697' into develop