Move double-span with table markup strategy from dev to master