Merge "Fix some inconsistency in docstrings"