Merge pull request #6876 from MikePetullo/keyutils