Make sure new lang key available during upgrade
Merge 1.8