Merge branch 'feature/optimization' into develop

Status Job ID Name Coverage
  Build
canceled #16498
build

 
  Test
canceled #16500
allowed to fail
code_quality

canceled #16499
test