Merged in content from CONET draft.