Merge branch 'feature/optimization' into develop

Status Job ID Name Coverage
  Build
canceled #17557
build

 
  Test
canceled #17561
allowed to fail
code_quality

canceled #17559
test