Added RFC 106 in branch-6-4