Merge remote-tracking branch 'origin/master'

Conflicts: package-lock.json package.json
Status Job ID Name Coverage
  Pre Deploy
passed #4768
docker-image-builder
build_docker_image

09:02