Merge "Revert "Remove invalid language code "bh" (alias of "bho")""