#3467 initial language.prop commit
fix merge #3467 for master
fix merge #3467 for master
#3467
#3467