Merge branch 'masterToMerge' into 'master'

Master to merge

See merge request !9
Status Name Job ID Coverage
  Setup
canceled setup #27306

 
  Build
canceled build #27307

 
  Test
canceled test #27308

 
  Deploy
canceled deploy #27309
allowed to fail

canceled site #27311
allowed to fail

canceled sonar #27310
allowed to fail