Merge branch 'cherry-pick-ebe9dae5' into 'test'

Merge branch 'hotfix' into 'test'

See merge request lihengchang/codereview-test!14

ttttttttttttttttt.txt

 111111111111111111111
-222222222222222222222
+222222222222222222222------------hotfix
 333333333333333333333
 let env = "test";
 444444444444444444444