Moving to rfc8171 ...