RFC 202 & 213: finalized and modified based on review comments.