Merge branch 'feature/local05' into develop

Status Job ID Name Coverage
  Build
canceled #23546
build

 
  Test
canceled #23549
allowed to fail
code_quality

canceled #23547
test