copy over changes for other languages too #838