LPS-34860 Minor changes after PM review
LPS-34860 build-lang