Fix bug where a string is shorter than expected.
Fix bug where a string is shorter than expected.
Merge remote-tracking branch 'origin/master' into dsc-1279