Merge branch 'master' into 'staging.hisworklist'

# Conflicts:
#   .gitlab-ci.yml
Status Job ID Name Coverage
  Build In Staging
canceled #1864
shell allowed to fail
build_in_staging