Merge branch 'feature/optimization' into develop

Status Job ID Name Coverage
  Build
canceled #16941
build

 
  Test
canceled #16943
allowed to fail
code_quality

canceled #16942
test