Merge branch 'liuxin' into develop

Status Job ID Name Coverage
  Build
canceled #15858
build

 
  Test
canceled #15860
allowed to fail
code_quality

canceled #15859
test