Fixes: [30984] Improve key translation.
