Merge branch 'master' and update deckard

We need this to fix the tests.
3 jobs for policy-deny
in 5 minutes and 43 seconds and was queued for 2 seconds