Import RFC 87 and RFC 88 from master