Merge branch 'keys-blacklist' into keys-next