Merge branch 'Wesley' into 'master'

fixes HDRC-1:test test test

See merge request !3
Status Job ID Name Coverage
  Build
canceled #19
build

 
  Test
canceled #21
allowed to fail
code_quality

canceled #20
test