[#8536] use Markup's own interpolation
9 files changed