Merge origin/master

Status Job ID Name Coverage
  Build
canceled #1231
build

 
  Test
canceled #1233
allowed to fail
code_quality

canceled #1232
test