Adding RFC 88 (#4563)