Merge branch 'feature/bugs' into develop

Status Job ID Name Coverage
  Build
canceled #13942
build

 
  Test
canceled #13944
allowed to fail
code_quality

canceled #13943
test