case 3976 - Added test.
case 3976 - Minor changes.
Merge branch 'case-3976' into develop