Match new version of the specification
Merge commit '9bee1537c1353a351ed738d86e858a410e3d52d1'