Merge branch 'hotfix' into 'test'

See merge request lihengchang/codereview-test!14

(cherry picked from commit c4b32d58)

b19f724c Merge branch 'hotfix' into 'master'