cherry pick eb2c11d261895b425cb198f804d66409332cfe9a out of master
fix cherry.txt bug in release branch
TFS would not have a conflict here. qed