Merge branch 'liuxin' into develop

Status Job ID Name Coverage
  Build
canceled #14997
build

 
  Test
canceled #14999
allowed to fail
code_quality

canceled #14998
test