Merge branch 'master' and update deckard

We need this to fix the tests.
3 jobs for policy-deny in 5 minutes and 43 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #6398
docker linux amd64
build:linux:amd64

00:03:40

 
  Test
passed #6400
docker linux amd64
deckard:linux:amd64

00:02:02

passed #6399
docker linux amd64
test:linux:amd64

00:01:29