case 1667 - Use correct property reference.
Merge remote-tracking branch 'origin/case-1667' into develop