Merge branch 'hotfix-01' into 'test'

See merge request lihengchang/codereview-test!31

(cherry picked from commit 7f92391a)

cacdab7f Merge branch 'hotfix-01' into 'master'