Section 8 from RFC3633 merged (task #108)