Merge the codecs doc refactoring with 3.2.