Merge "Fix Doc8 errors" into amsterdam