Merge "Correct DOC8 errors"