Merge branch 'new-web-of-trust' into next