Merge "Add kbp language code"