Merge "fix PLM issue : P120829-4306 patchset2. apply string ID" into 2.0_beta