Merge branch 'uat' into develop

Status Job ID Name Coverage
  Build
canceled #17556
build

 
  Test
canceled #17560
allowed to fail
code_quality

canceled #17558
test