(imported from commit 97262590ac5ad56c18f415fa1c777510aed2baeb)
This will make it slightly easier to consume the data from our clients. Ref: RFC 6585 §4 (imported from commit 6d323dc25db78a6d84a163add950f039e03e73d3)
(imported from commit 838dd34f101025ba161291992a56972cd374104b)