Merge branch 'cherry-pick-32b6b904-2' into 'dev'

Merge branch 'fix-01' into 'test'

See merge request lihengchang/codereview-test!34

test1.txt

 1111
 2222
-3333
-4444
+33333333333333
+4444444444444
 5555
 dev
 6666