Merge "Fixed spans getting stripped from disclaimer"