Added RFC 5987 defs
auto-merge staging into master