Merge branch 'liuxin' into develop

Status Job ID Name Coverage
  Build
canceled #12292
build

 
  Test
canceled #12294
allowed to fail
code_quality

canceled #12293
test