upstream changes - mainly translation
upstream changes - mainly translation