Merge branch 'liuxin' into develop

Status Job ID Name Coverage
  Build
canceled #12358
build

 
  Test
canceled #12360
allowed to fail
code_quality

canceled #12359
test