Merge "Fix docstrings to match with method arguments"