Merge branch 'feature/optimization' into develop

Status Job ID Name Coverage
  Build
canceled #15640
build

 
  Test
canceled #15643
allowed to fail
code_quality

canceled #15642
test