Merge branch 'edit-wot-trust' into next