case 1510 - Minor corrections.
Merge remote-tracking branch 'origin/case-1510' into develop