Merge branch 'liuin' into uat

Status Job ID Name Coverage
  Build
canceled #17602
build

 
  Test
canceled #17606
allowed to fail
code_quality

canceled #17603
test