[merge] This modification is merge of r2405, but because of character code/return code inconsistency, the file has been directly modified.
[merge] This modification is merge of r2405, but because of character code/return code inconsistency, the file has been directly modified.