Merge branch 'feature/optimization' into develop

Status Job ID Name Coverage
  Build
canceled #16853
build

 
  Test
canceled #16856
allowed to fail
code_quality

canceled #16854
test