Merge branch 'master' into 'staging_hisworklist'

# Conflicts:
#   .gitlab-ci.yml
#   docker-compose.yml
#   imports/api/collections/worklist4hislink.js
1 job from staging_hisworklist in 15 minutes and 18 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build In Staging
canceled #1821
shell allowed to fail
build_in_staging

15:18