Not an IETF stream draft, but independent (affects boilerplate)