F3281515

F3281515: trailing-context.diff