Merge branch 'gao' into 'master'

Gao

See merge request !1
Status Job ID Name Coverage
  Build
failed #1016
build

 
  Test
skipped #1018
allowed to fail
code_quality
skipped #1017
test
 
Name Stage Failure
failed
build Build There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job trace