Merge branch 'feature/bugs' into develop

Status Job ID Name Coverage
  Build
canceled #12553
build

 
  Test
canceled #12555
allowed to fail
code_quality

canceled #12554
test