The latest version of the spec has the two being combined.