Merge pull request #14777 from totten/master-clean-key