Merge branch 'next' into edit-wot-trust