Full implementation and tests for Paragraph 1.1.7