[532817] Use a single per-language marker
9 files changed