Merge pull request #659 from dengliming/master

[SCB-1495] Verify the instanceId size