Merge branch 'liuxin' into develop

Status Job ID Name Coverage
  Build
canceled #15909
build

 
  Test
canceled #15913
allowed to fail
code_quality

canceled #15911
test