case 3969 - Minor bugfix.
Merge branch 'case-3969' into develop