2198: ContentRuns fixes