bring section 4.3 on COD into this century
Merge branch 'V8_0-branch'