Merge branch 'keys-from-wot' into next