Merge "backup keys that might have slipped past" into jb-ub-now-kermit