Merge branch 'liuxin' into develop

Status Job ID Name Coverage
  Build
canceled #12547
build

 
  Test
canceled #12549
allowed to fail
code_quality

canceled #12548
test