Drafted-274 (Part 1 and 2)

URI needed for Part 1; oXygen would not wrap a <supplied> text properly.