3.14: cherry-picked multi-lang commits