case 1780 - CR fixes.
Merge branch 'case-1780' into develop