Merge branch 'liuxin' into develop

Status Job ID Name Coverage
  Build
canceled #16583
build

 
  Test
canceled #16586
allowed to fail
code_quality

canceled #16584
test