bring inline with rfc changes