Merge branch 'master' into 'url-resolver-kafka'

# Conflicts:
#   .gitlab-ci.yml
#   config.json
#   src/app.ts
2 jobs for url-resolver-kafka in 1 minute and 18 seconds (queued for 55 minutes and 27 seconds)