test committed changes from Jiefeng

test committed changes from Jiefeng
Merge remote-tracking branch 'upstream/master'
new text