Manually merged with jono/7XX-rfc upstream and also modified with new entries and formatting.