Merge branch 'residence' into 'dev'

Residence

See merge request federez/re2o!412
Status Job ID Name Coverage
  Lint
failed #1514
lint

 
Name Stage Failure
failed
lint Lint There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job trace