Merge branch 'liuxin' into develop

Status Job ID Name Coverage
  Build
canceled #11800
build

 
  Test
canceled #11802
allowed to fail
code_quality

canceled #11801
test