LPS-45090 Forward port the changes from 6.2
LPS-45090 lang keys