Merge "Fix inconsistent docs"