Propogate changes from OG-Language. (cherry-picking from commit 715add7878f52843f1d7263bf8ae76761c9bd052)